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

Change-Id: Ib64593d75717353ff5693a7ad58eb9f87d4465fc