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

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