am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev

* commit '7385aca1a2bcb702cbf49b4cd3d1cf60972f9407':
  DO NOT MERGE Enhance local log.