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: ec399963 am: 6fb99083 am: a6982b7a
Change-Id: Ie75aad6c960d8311cdeea3542e4d6b27ed23a99f