am d230fd8b: (-s ours) am 5d19d620: am 4799a9e0: am f8808db0: am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev

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