Merge "Revert "Revert "Update for using integers for major/minor versions in FQName."""
am: 2d33a28045

Change-Id: I00bc9ab3afa9687a33c1386a2f5f00c9b20958a1