Merge "Remove @SystemApi annotation for an overriding method"