Re-apply "Remove unused phonys"

This reverts commit 4a6890934a3a61484b8049029c31e4126edb1824.

Test: presubmit / codesearch
Change-Id: I217ca247e603e15ac8201ffc61f14c911efa555f
1 file changed