merge CyanogenMod

Change-Id: I5eebc20eac107d5fbe63433e048c8e55e4a1d1ae