[automerger skipped] Merge "Make getExtensionVersion a little more...
[automerger skipped] Merge "Make getExtensionVersion a little more forward-proof" am: aa4f4de2 am: ad37fde5 -s ours am: 23c453c5 -s ours
am skip reason: Change-Id I36855ba1881da4056276f4a5626ca64d2129353b with SHA-1 01d647f9 is in history
Change-Id: If5bf75137079e914e9087431b57fc0c37f3a9e07