Some more updates to kitkat/cm-11.0  branches