Merge "Partially revert ag/10355722 to fix perf regression" into rvc-dev am: c435afa8 am: 16a433c0 Change-Id: Ie15e4c4d78b61a98f56f95428857fe42b00726b8