Reconcile with jb-release

Change-Id: Ib078ec6a8d678533d89d2db0d1d8df2fa6c724e8