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

Change-Id: Id9eb8b95284a0da7480d974028d194ed0595735d
tree: bdc0c7b4ff611d6a0af5546c831ee27742113d5a
  1. tests/