am 3f7405e9: am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.

Merge commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf'

* commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.