am 0a2bb853: am 97358651: Revert the fix for incorrect package-private overriding.

* commit '0a2bb8537b3dbb4ef7ff03b64499ec6a14cdaf46':
  Revert the fix for incorrect package-private overriding.