This time in XML files. Change-Id: Iebe36810c3a2d7a6ff354f43808b1b8649b85637
Change-Id: I4c2f2acf797a3a753f8a6061db3d2bcdc7d642f0