Remove unused flag

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