This reverts commit 48945224. Reason for revert: <b/127835630> Change-Id: I0bc90c26e5b7d6b4d94704a2a1f92bbc889c025c