Updates for CM11

Change-Id: Ie4d1a386ea498151bc680288acbb0091c5b2b4a5