Reconcile with jb-release

Change-Id: Ic12bd9ea68dde200b868659ed6134332fda8f244