This reverts commit eded0cc3. Reason for revert: b/118412497 Change-Id: I6bdafb6283a39be3bf678312fc909fba042301fe