Remove duplicate code which introduced in 172a7c3

Change-Id: I47b7e6f7ab32ea3b8cef58f1901f87f9f999fcc4
Merge remote-tracking branch 'CM/cm-11.0' into cm-11.0