Reconcile with jb-release

Change-Id: I352734f21dd84f12467765c5109699eec44b316a