Apparently some AWS-supplied tools use undocumented root elements. Change-Id: I3d56f9560c2d96b08e6837d053fdff654c531062 Closes-Bug: #1611749