541c5d272d
This reverts commit 0adca26744.
Reason for revert: potential cause of presubmit failures
Change-Id: I102d92f86afc7fa21c806d3cf1642e343dc91d45