Replace ubuntu_version callsites that were missed

Change-Id: Ia37093c6918052b3a7240414538954b9c4ddca31