am 1d4afec2: am 6b071c38: Reconcile with jb-release

* commit '1d4afec296da19b858918e15129eb29cc97a3c5d':