Reconcile with jb-release

Change-Id: I39749f27bd2911551a009fed4a3ed045a5e6eb12