This reverts commit f6879ea16e. Bug: T109638 Change-Id: I770d8d33a4cff3829bdea9a4df24de209cbe691b
f6879ea16e