d6692cedff
This reverts commit 8935d9515c.
Reason for revert:
Bug: 109814458
Bug: 79935289
Change-Id: I33e4933a68060b6055ad7af8e45cffceec14880d