Reconcile with jb-release

Change-Id: Idee820191b52f081d94c11787fe89452e1bf073d