am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit 'aed7823abe0a08e4ab4cf73ce3e28f4e39a03af7':
  Bump revision number for all system images