am dfab36f0: Reconcile with jb-release

* commit 'dfab36f0eca45cdd04be538f3f99e5a8193a8261':