Merge "Tweak compat change override policy"
am: 880792723a

Change-Id: I8b93e3493cb4117891813ae58daa87ca4909e169