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

Change-Id: I60d1dd7a490e86c1194da929483347f99b9f421d