Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Change-Id: I75d56ed144b024b15ae3efa3577dba7bd02768e4