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

Change-Id: I20a1de4667d8240e0eb4064db1dc147c1b0afb6d