Reconcile with jb-release

Change-Id: Ibe8fa4d5c20807c1c5507b7937f0f5ffdf2efdd5