Merge remote-tracking branch 'mot/kitkat-mr1-release-ghost' into cm-11.0