Reconcile with jb-release

Change-Id: I92864df53af5b49c90255cbf07c095bbeb7be0a1