This reverts commit 8e017de029. Reason for revert: Broke build on udc-d1-dev branch. See b/286328787 Change-Id: I3b94e6ab51a7b771dc02ab8736fdb9228a64db49
8e017de029