Merge remote-tracking branch 'refs/remotes/github/cm-10.1' into cm-10.1

Change-Id: Iac2f41399b8f8e8df8cfd028b74077c3b8a58824