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

Change-Id: I28a69b5a3d1bb2d9c9450cb15fd9a534f00cdfe7