Try harder to get version string

Change-Id: Iedf03d4e809eb3cb1b15cb1e6f1ca88737dbc121