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