Merge branch cm-10.2 from CyanogenMod

N/A

Change-Id: I4d87bb108ef751189e686791e9af22ad983e5150
Signed-off-by: huangqiwu <huangqiwu@xiaomi.com>