Customize for cm-11.0 part4

Change-Id: I9380fea6798f4b44c76b8d3ca253b26df64e23fd