Merge changes from topic "ownerz"

* changes:
  Tweaks to AOSP upload hook logic.
  Upload hook that guides people towards AOSP.