Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
am: 0cb70101c7
am: c4ad2628e1
am: 338eaf911b
Change-Id: I2d2bfecce86bfefd5e2e911eb2c93dff19e91e15
This commit is contained in: