OTA updates from CM11

Change-Id: I72a8fd5b135940e676a8a96f5d0f129ac1b8108e