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

* commit '0b9624d4c46ba56f12b931ec4f56d33f378b7e6f':
  DO NOT MERGE Enhance local log.