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