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

Change-Id: I434cbf4d32ecd3e79edb501c823e04c12583e85b