Reconcile with jb-release

Change-Id: I84c9b6e4663448275a78cab4ea14f4952b440c8f