This reverts commit 4a04b83e. Reason for revert: breaking wm presubmit Bug: 224629724 Change-Id: I351c6e9ef17a45fab4a1f957af29c835e8fc1e30