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

Change-Id: I288b3c0af3e26e137b5e3a16cfc3d8ce7235b9f4