Merge "Fix policy for platform compat UI" am: 3208f994c1 am: e184ff6028 am: b85d1971bf

Change-Id: I1b8f54ab614ec7ad3649d24e6fff661038817557