[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 skip reason: Change-Id I36855ba1881da4056276f4a5626ca64d2129353b with SHA-1 01d647f9 is in history
Change-Id: I3e8283a43e847f734ed38fcd70d2708163a20b2d