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

Change-Id: Ib3c4bb83421360add15219251a389d25f1211497