Merge "API Compatibility: Fix incompatible abstract methods on Context"