Reconcile with jb-release

Change-Id: I498b24819154fc97ab5f846cd088810d68a982ea