This reverts commit 499a4036. Bug: 63852675 Change-Id: I154de318a66261290c848d2a8c32a82e20a46dbb Merged-In: Ifb8b0fd23e6306b576c2c947dcab45d811e4becb