Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I650c2594940e3e33e8824254a6204feb1439038e
tree: af6a114b832449c7a354ddd9010ceef9e8ab987e
  1. tests/