Merge changes from topic "add-caching-platformcompat" am: 8f269473b2

Change-Id: If1af69efe644b57c990a85bbb07ea9442edf808e