Reconcile with jb-mr1-release - do not merge

Change-Id: I6f2d20f646b742314b143f863957623169732bef