am ccc9a8a9: am 188ce277: am 073f2d9f: am 65558d5d: am 0af60dfc: am 682077d1: Merge "help image updates" into jb-dev

* commit 'ccc9a8a954907c4308d22846569801f17badd466':