Merge "Properly expose methods that override a non-hidden method in a hidden superclass in the API files." into mnc-ub-dev