Merge "Mitigating cache corruption in ArrayMap" into pi-dev
am: 841de8fb31

Change-Id: Ia8e5eddc8837af23c2fdcb48b40e98f1eff3bc8b