Also, make the version check hopefully less cryptic. Change-Id: I516ed7aa7b8c3a7f005997e7287c68de52eed54c