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

Change-Id: I974a69e7b44067a92c265f1076226850ffbff92b
tree: 417c8738bccdf592a90ed2706b1b31215391b669
  1. tests/