Reconcile with jb-release

Change-Id: I08b942fce652497e6ba8b9f9e1171e26bfe2c0c9