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