am b9bf3ee0: Reconcile with jb-release

* commit 'b9bf3ee004e70555219cd40b64e8eb1bcbf00df0':