This reverts commit ca930d166ec2b3d20a8abc03aaabb7874a6c7745. Reason for revert: the Merged-In tag conflicts with a cherry-pick into AOSP Merged-In: Id50db88f4ff36069b0f392c81dd9d90c24cd2206 Change-Id: If284ac4957cf84f0acc118f232f6acf476e05b98
This reverts commit ca930d166ec2b3d20a8abc03aaabb7874a6c7745. Reason for revert: the Merged-In tag conflicts with a cherry-pick into AOSP Merged-In: Id50db88f4ff36069b0f392c81dd9d90c24cd2206 Change-Id: If284ac4957cf84f0acc118f232f6acf476e05b98