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

Change-Id: I0f6ba72bd4d6d9bdbb8a62163ac36fc1c6cca983