7ff297a81f
This reverts commit 0499fb2060.
Reason for revert: This might break the post submit test. See b/150401176
Change-Id: Iafc420fff72de8e83ce5e325fc1e5b1a1efe7350