Reconcile with jb-mr1-release - do not merge

Change-Id: Ib3edff1606fee3fd6dc4f66ed8588d8a5fab5e07
tree: 7e7890a72aeb9693086434745f888876392c7eb5
  1. tests/