am 7f60758b: am 30236463: merge in klp-release (no-op)

* commit '7f60758be2844c34bac4efca93df698bfd24f125':
  Configure PRISM defaults for tilapia correctly