Reconcile with jb-release

Change-Id: Ied4d1f919062ea2abeee45ce4ecbc92a105b8f3d