Reconcile with jb-release

Change-Id: I56d5e7da1f2c56109295f9fb6d836b4abd148ee4