am 0fda2cce: Reconcile with jb-release

* commit '0fda2cce44cd49f16d50ed618c954e12e453f920':