Merge "Fix ambiguous commit number." am: 8a6135bb2c
am: 8e20adb810

* commit '8e20adb810cf3629e8fb12b7eb8fad5845266e6d':
  Fix ambiguous commit number.