Merge "Allow XML file paths to be customized with sysprop" am: 931d1554c3 am: 32a4b317ef

Change-Id: I3677fb8d63d08eef3517b795ae42622216d0268f