merge CyanogenMOd

Change-Id: I667b349fbaa8b5246ffb78e0d3114bf560ec3b55