Reconcile with jb-mr1-release - do not merge

Change-Id: Ib5ce9a829c2afde6f7d727c056c24386c6d639fd