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

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