Customize for cm-11.0 part3

Change-Id: Ia451b7d9a649b5496be733ae5df7869910fb5e82