am 0af60dfc: am 682077d1: Merge "help image updates" into jb-dev

* commit '0af60dfc69e9cc11b8f8111a7ce657a74a0a4322':
  help image updates