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

Change-Id: I0599d94075164ed0f951a438e4302d4484d3bb8e