Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev"

This reverts commit 253fdc667a18ec0cfdc511c7d21e3b308ecb9cfb.

Change-Id: If8862e289eb6693650713ff819c8b05f65cdeda5
4 files changed
tree: 33c3f575c717c4c498f94ea0a5b09b3da5fc91a2
  1. tests/