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

Change-Id: I9e5e678e89961720b25488aa13e5d35ef17f1f2a