am c7f64fdf: Merge "Keep multiple kernel logs"

* commit 'c7f64fdf08b254ff94012c1815198b9635f508a7':
  Keep multiple kernel logs