am dfc8120b: am b447a891: am 6afa8fb4: am 20dfdc18: am f87279c6: Merge "media: combine log to reduce the size" into mnc-dev

* commit 'dfc8120b6eb7eef03c9f996a3ad9ea6e7af20aa5':
  media: combine log to reduce the size