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

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