Reconcile with jb-release

Change-Id: I187fd2f871882b894e1c7db7b2ff61763f8bc090