[automerger skipped] Add property-invalidated cache am: 764ff47f87 am: 7c9f1499bc am: 9df97ead62 -s ours
am skip reason: skipped by user timmurray

Change-Id: I49b86486d5ac8e58ba0f1ff4b7de39a66eaa3deb