Merge "Add extra compat change overriding methods." am: b389ffe2d9 am: 799a6aa021
am: 283ba38e4d

Change-Id: I98c2335df98493a6f13c2b2eec68221aaab86785