Merge "Add basic logic for new platform compatibilty framework." am: c4cedf7b56 am: fcb0f0c2de
am: 3140b2c9a1

Change-Id: Ie4bb338c522a802c0192ae700404f4c3133720be