Merge "Fixing a vogar issue where outcomes weren't making their way into XML." into dalvik-dev