Merge "Use changeID and Compatibility.isChangeEnabled for Mainline" am: 1d40225791 am: f1317cc00c

Change-Id: If7f87f58d9014f36a981a767f8ab4c47e63c9442