Merge "Fix nesting of sample XML code in complex-resources doc" into nyc-mr1-dev