am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"

* commit '20fa9a8e65cd84cabc563f87839706d9f7308a8f':
  Use PRIVATE_ALL_OBJECTS