Reconcile with jb-release

Change-Id: Ibde708a3b56604dea5f6eb4699519c0981b04aeb