am 3f9c95b6: am d6d68d42: Fix CTS BuildVersionTest for KKW

* commit '3f9c95b67d180da652eb84f364ca659c7d525c07':
  Fix CTS BuildVersionTest for KKW