Backporting the change of ag/15629060 to rvc-qpr-dev

Bug: 172251622
Bug: 197035186

Change-Id: I5aceab7697ef7a40bc08b0e9a79ed1284259797a
Merged-In: I7e2f95fd85e18127dc481f188ace8ad6effc4831
Test: Manual
1 file changed