am 97af61da: am 178f5eee: am e1baec5d: am 4393aeff: am 947e4e27: am 29b060fa: am aed7823a: resolve merge conflicts of 8e4ac6bd to jb-mr1.1-dev (merge -s ours)

* commit '97af61da9ccf2a1482921a814faa2e374c3a6535':
  Bump revision number for all system images