4dbac6caa9
This reverts commit dfb334f1e1.
Reason for revert: A bunch of WM fixes are in (b/291562764)
Change-Id: I9d08dab976cda112f802ee91256c09ef2026a01f