Merge "Make getExtensionVersion a little more forward-proof" into rvc-dev am:...
Merge "Make getExtensionVersion a little more forward-proof" into rvc-dev am: ce316be9 am: 3bb8a442 am: 634c5cd8 am: bcdc52ca
Change-Id: I5566ff6d59cf884f44a1b917360e8cbe837c6805