n1: Remove deprecated entries

Change-Id: If6d34c46638a40ecf399bada185802fb6f3fd4fe
Merge branch 'cm-11.0' into kk_mkt