XmlInspector nested entities

Change-Id: I086e5bd7b971163bf33b341b1164a0cf898478cf