Reconcile with jb-release

Change-Id: Ic8cef33354ceb00868f939950089574353e76ce3