Reconcile with jb-release

Change-Id: I38e3c46db8518d6c3d45afcf7b1d99421d95811d