Add STE patches cherrypicking cm 11.0 part 2