am 185e8204: am c7f64fdf: Merge "Keep multiple kernel logs"

* commit '185e8204c6e29e2177721a30c73928fb4e5382fa':
  Keep multiple kernel logs