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

Change-Id: I77f36a1d9be2d486ca126472f26b5a35739a88cb