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

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