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

Change-Id: I88c0caf2c0904db1a1acfae7072699031d66fcdf