Remove unused flag

Change-Id: I69e4ea8f210b6a2c3f3e6570644328b55bd6631d
Merge branch 'cm-11.0' into martincz