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

Change-Id: I55462975499d59a6e4a1686e85c11d0294d46f89