This reverts commit 91bba497. Reason for revert: unblock wm presubmit Fix: 157629296 Change-Id: I04fd8b79de025d7c531ac03218a7590e6a32e1be