Merge Cyanogenmod

Change-Id: Ib80e3ffec075e413541b03ca76b74ba0fee9352f