merge changes from remotes/github/cm-10.1 into master

Conflicts:
res/values/cm_strings.xml

Change-Id: I6234dae6313967d494e70eadb3a0a92110c7399d