Support for JCROM
Merge remote-tracking branch 'origin/cm-11.0-jcrom' into cm-11.0-jcrom