Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Change-Id: I9045a5afcf5f52aeaf2c5bccf3dfb19bbaecaf5b