Test: n/a
Change-Id: Ie3db52a00e393418edb59af3544a80c1b9492a9f
Merged-In: Ie3db52a00e393418edb59af3544a80c1b9492a9f

Test: n/a
Change-Id: Ie3db52a00e393418edb59af3544a80c1b9492a9f
Ignore-AOSP-First: can't submit in AOSP due to merge conflicts