d710: remove duplicate policies

Change-Id: I3b2c09272f4df6a488a3c3cb7c7fd2e90d2bada9
Merge branch 'cm-11.0' into kk_mkt
Merge branch 'mokee' into HEAD