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

Change-Id: I29bd6489714d3101eef2d8c18a12bd71391ff4ef