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

Change-Id: I69ad99a90501707d8c2f7f223ecb2bd76ca0e530