Reconcile with jb-release

Change-Id: Ibc858f78c560ad80f6bf201f33dc2b9e0f3e00aa