This reverts commit a26c626564. Bug: 27532279 Change-Id: I0c0394a8abf12e7382e7083a0b9d7f8385c3a63d
a26c626564