am 4799a9e0: am f8808db0: am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev

* commit '4799a9e06e2491aeedde7db46d62abfb7aa1d594':
  Revert "DO NOT MERGE Enhance local log."