Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev" am: 07f9388e4f am: 0d9ef269a9  -s ours
am: 467949ba73

Change-Id: Iaf34e45c20e8d88927741cc29406859f4755f334
tree: 1c627dc4cc903d5cc482845026ef71d83ca5dfcf
  1. tests/