Merge branch 'CM/stable/cm-11.0'

Change-Id: Ib069b2d427c99b6f8a5f44898e9d06e9f2a0e54e