Merge changes from topic "presubmit-am-9ff2f54e09c34d93b642e0a138ab64da" into tm-dev

* changes:
  [automerged blank] Convert extension version assignment to be simple 2p: dfbfcbfca5
  Convert extension version assignment to be simple