merge CyanogenMod

Change-Id: I0688a21c5dc8e45e546fc264c718ce663a9d8381