Comment this out since it will conflict in Manifest merge