Update from cm 10.2 branch