This reverts commit 890558f1fa. This restores Id584208d9b67d877606a0add1d71c9b1784cdb1b with some fixes. Bug: T323786 Bug: T352742 Change-Id: Ib31c451ddd75b06c95a544c8a3d2a64b32264126
890558f1fa