This reverts commit 7faa7a7420. Reason for revert: T224607 Change-Id: I549810a4cd2e424cc4a438887d2f24614a24cc00
7faa7a7420