This reverts commit 86ed94a1. Reason for revert: break wm presubmit Change-Id: Ie9bbfa4e1293560c0605ee68f0e87d00a2b0579d