merge from cm10.1
Merge from cm10.1