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

Change-Id: If560c3b115101910ab4e7e2976463ebd30d79d1b