merge CyanogenMod

Change-Id: Ic6303a62e4fcbeeccdd647dcdc83c12c67f96761