merge from cm-10.2

removed unnecessary.