Reconcile with jb-release

Change-Id: I439c76c3cae573c9dd875a329131e90ee6083717