Reconcile with jb-release

Change-Id: I5d23d3842e74040647a34aad93ca6512299f2d17