Phone: Refactor CM Additions resources

Change-Id: Ib7dbc96fff2a63d6f6f73bee6b90ff20cc194411
Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1