Reconcile with jb-release

Change-Id: Ia5de9692e507a605d3b6937ec65da26169a3ea8e