Ensure we use the version.txt when available
am: 77846085c0

Change-Id: I93e0933edda125921e2d5986c468622ef9a81763