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

Change-Id: Idb106fefa53d2cf96bf0e53e5649232579e8ffe1