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

Change-Id: I430aaea6861cb74388eb48ac5bc673ef1a5998fd