Reconcile with jb-mr1-release - do not merge

Change-Id: I8063d61628dd2822ab105f7f2f3d89fd0192b561
tree: 2ccedeefbf6d294313feef38bb2e5c10d26275fe
  1. tests/