DO NOT MERGE, Revert "resolve merge conflicts of 4bebe6db69 to nyc-dev"

This reverts commit 3fbcb77d76f6d8aa6335f821845791ce4c049e35.

This test is not necessary in nyc-dev or later.

Change-Id: I98224dcc5aae100f1f9717ba632da203bbffa8b2
Bug: 35429755
3 files changed