Revert "Manually merge commit '9be9d5865ba2584a251642359710c074061dee5e' into nyc-dev"
am: 07f9388e4f

Change-Id: I33126a859f4cf14227f743b74fd965b3a0737e9b
tree: f5ee291c92c30d463dbad4e3db9abeb6c81ea1e6
  1. tests/