Merge with CM-11.0

Change-Id: Ia033e5f73120ae68710a7597dc2f933b7dd208d2