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

Change-Id: I43501839c00010c2e6222a571a0ae00752b26b7d