am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5

Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
  Part of issue #2168428: STOP SHIP: Bump API version to 5