Revert

This reverts commit 4f7dc13067ab4aa4f0c3f5373ee0a28c0285eea1.

Reason for revert: Reverting based on team discussion from 5/5/20

Bug: 129476618

Change-Id: Iaadc5ce80d8828b3c69bf91e78dd586232c74fc6
1 file changed