added new changes from cm11 repo