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