am d82363c1: Reconcile with jb-release

* commit 'd82363c19cbfea1d6505f2c21467df84d021d511':