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

Change-Id: I91d6e1989508aae4895ff5d6611a64e1450744f9