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

Change-Id: I12d4a58d07acfa901dddda62f7df767de3bd27af