This is the revert of ag/572619. This reverts commit 9261d9d64548f0221de50eb99f3675488a4176a4, reversing changes made to 32b61ab28f54e5b00f472b2166f9b1100375e4ff. Bug: 18609055 Bug: 17769720 Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8
This is the revert of ag/572619. This reverts commit 9261d9d64548f0221de50eb99f3675488a4176a4, reversing changes made to 32b61ab28f54e5b00f472b2166f9b1100375e4ff. Bug: 18609055 Bug: 17769720 Change-Id: I122eba200f2071d4e5777ec34c1d04fb567345a8