am 0b1ca835: am afc23719: organize scripts with per-version sections to avoid merge conflicts

* commit '0b1ca8354803a1007e491865a7335015c2d4118b':
  organize scripts with per-version sections to avoid merge conflicts