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

Change-Id: I520af7d8c3f8325d223ff7021eb12e476b37b93a