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

Change-Id: I1bfd455eca23e774d85c3af0ae06d8005218ddbb