Reconcile with jb-release

Change-Id: I0763b67b445b03b74c5a873a5373d30528acebf9