Fix for build error
Reverted Deletion and commited out instead.
Merge remote-tracking branch 'origin/cm-10.1' into cm-10.2