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

Change-Id: I542ccd948f3a80e402ce6d80e8951091c8e07001