merge CyanogenMod

Change-Id: Ic7aceec27f548a4d0cd596d0b818926748bc49e5