Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3e6dea054ed56ef2477198ee2082f97433d359c2