Reconcile with jb-mr1-release - do not merge

Change-Id: I79576b76e16ecd842c900211ae70c22d4ae0004d