merge all latest cm-10.2 stuff