Reconcile with jb-release

Change-Id: I41b9ff7b554a0bf8e1dc11d8873036e7ff7f3918