merge from cm10.1