am 0e52bfb0: am d399af8c: Merge "Require that secondary media is always present." into klp-dev

* commit '0e52bfb0d5aabb05ca5e1c84eba71ab2569f94d3':
  Require that secondary media is always present.