merge from cm10.1(2013/04/20)