Reconcile with jb-mr1-release - do not merge

Change-Id: I4ab99f1afaeb5abf8220704807cdd9d0fcd45f9d
tree: 7771164ec3f2bdfc6b00e3a21f8fee9ba238f2e5
  1. tests/