am 218ea026: Reconcile with jb-release

* commit '218ea026d5722ecf62b6969b4c8924236516ccd0':