am d0ba66de: Reconcile with jb-release

* commit 'd0ba66decf9c5890bdcb8d98112efa319aefa008':