Merge changes from topic "add-caching-platformcompat" am: 8f269473b2 am: 61e6c86f54 am: 309680b57a

Change-Id: I9aa476dc8038fc5ae18fafbd317e991e16067012