Reconcile with jb-release

Change-Id: I937a350902e0c3aa128d9f33f67994099da8a634