Reconcile with jb-release

Change-Id: I451b63991c4550290f6e32f2f555f0412bf0b28c