Merge "cm: Include private signing keys if present" into cm-10.1