More in line with cm-11.0 tree

Change-Id: Iaaad4235a632f53ea34e2d1c4909e6690a7b9fdb