This reverts commit 96d221f9. Reason for revert: build breakage for sdk target Change-Id: I933df62738c08b48d8ae4ea951b2cb4837616c78