Customize for cm-11.0 part3

Change-Id: I9441852f69913fbaa1b1f4f136f55874a70c123d