Customize for cm-11.0

Change-Id: I3a30fe30dadfb9540d1b0f373db8802d2151724a