Reconcile with jb-release

Change-Id: I0625bfe56c7aad5b243bbdaca39d9aa5206768e5