Manually change file for commit "Merge branch 'qcril' into cm-10.2"