am d40eec36: Forgot to repo upload --amend.  Yay.

Merge commit 'd40eec360f86d8f3d7f9229dbfdc1e54628bfa8a'

* commit 'd40eec360f86d8f3d7f9229dbfdc1e54628bfa8a':
  Forgot to repo upload --amend.  Yay.