Reconcile with jb-release

Change-Id: Id6788c8571153e4498d3e752c1b2b225090a58a8