merge changes from CyanogenMod 10.2 into local branch

Change-Id: Iab81c611d1e696823fc9756b12e15d8da9ebc97e