Remove unused flag

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