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

Change-Id: I3b0ee31ebe75db3609e38aeda4ccf10d39009646