Bug: 70550124 Test: XML only change, visual inspection. Change-Id: Iaea3f100051bb908b13ca6809463db7f01f8d92d