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

Change-Id: Ic8b5c8e40b0fda124ba5c4790a1edb169a0035a7