Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev