Merge "Use changeID and Compatibility.isChangeEnabled for Mainline"