More to cm 11

Change-Id: I4a130f5468e0dfdb75a6089364a36989a62d6e06