am 58b2d330: (-s ours) am 0b9624d4: am 98961ea0: am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev

* commit '58b2d330b71412ac66ad38b7caf15920bc93f59a':
  DO NOT MERGE Enhance local log.