Customize for cm-11.0 part2

Change-Id: I20cebabf81112e30e070e2baa106a45d495a82a0