1022

Change-Id: I36b8e616895ccaeaa1d886346ba18e27cef3c63a
merge changes from CyanogenMod 10.2 into local branch