Reconcile with jb-release

Change-Id: I0e22b35f0ab64aa2782823a53985089b63fd026d