Do not transfer unneeded training zero bytes in INQUIRY response.

It is an addition to r269631.

(cherry picked from commit f7e6c416bfd801081a2d8a39aa03c9b43677a95d)
Fix couple issues with ROD tokens content.

MFC after:	3 days

(cherry picked from commit b2a100cdc2686d26247a0d93c72892c7cfe48eff)