Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f  -s ours am: 9f775619f8 am: 987c7c6bc9
am: aab46c8b04  -s ours

Change-Id: I7b5770504884fd773a626811f963c8fb6544c11a
tree: 6dbf6a3d5cc9fef27924b050e8bca154e99a4e7c
  1. tests/