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

Change-Id: Ia457329098c5b55c16b4a0a34b5a0076fcef67cc
tree: 33198e857b2ea238cc749208df0a5d4e66be76ed
  1. tests/