Reconcile with jb-release

Change-Id: Ia7adbc708c661ef21a54ae85315de1b061d3cd53