Critical Update:
Fixes an infinite loop in an xml parsing function.

Change-Id: I54303300c0442cf1beefc391a182e68b6485ad04
(cherry picked from commit 1f077732a1267c44104985ba3f10132811bbc249)