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

* commit '98961ea0007ab540794c8d460d9b060e9503d9c6':
  DO NOT MERGE Enhance local log.