Revert "Move type to general policy."

This reverts commit 1e2b1aa84bfd6c4799f85e1947fd87a89b16c7f9

Change-Id: I25f545d91df8b41bbe02fd30335c0e0f68b5c63e
1 file changed