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

Change-Id: Iddf9a966691f7f0f76d3822617d2c3000ecc704f