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

Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934