Merge "Upload platform compat config generated from framework target." am: d7345e923a am: 01a10679ac am: f74bce37de am: 1d7d028877
am: f9a466503c

Change-Id: Ib79a4c67d9efd4060212ff5d5dd266a12912d36c