Make old_build_version optional AND allow empty strings

Change-Id: I21efafb581b85c4770165b2b9547e4e38c0f1dd2