Merge "Fixes xml node name to issue tracker resolves. am: 9bc28e3c6a am: ae363f1e98 am: 160e6028a2" into nyc-mr2-dev-plus-aosp