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

* commit '2d39bfd51fabee0396fa3107ff98065ef4832667':
  Properly expose methods that override a non-hidden method in a hidden superclass in the API files.