Merge "Fixes xml node name to issue tracker resolves. am: 9bc28e3c am: ae363f1e am: 160e6028" into nyc-mr2-dev-plus-aosp