Reconcile with jb-release

Change-Id: Iab9b19384ab6706f1dfca89f21ffc142f47225a3