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

Change-Id: I0ef140d90408b238a766c8f524ebda617ffa5edd