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

Change-Id: I2adc341bb00304d02566383451138f8ba8027a4d