Reconcile with jb-release

Change-Id: I10b0459ad51c4a2d7d62ad73d2a8fd3e51828f9c