Sync with cyanogenmod

Change-Id: I6b794d6c9c27b2d6436bdf4fec51c84a7859c134