Updates from CM11 vendor/cm