Merged with cm10.1 default.xml