This reverts commit 261a9f94. Reason for revert: b/143503843 Change-Id: I7022f7fb9e06a5b223043c26b6849973fec420b0