sync with cm11 tree