Customize for cm-11.0 part3

Change-Id: I94b7298cadc44ce9716f83d6c8d548e477395e31