This reverts commit cbd8793a. Reason for revert: b/153273664 Bug: 153273664 Change-Id: Ic3a0778e896afd5e3fdbc234a5b3521257222dcd