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

* commit 'f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
  DO NOT MERGE Enhance local log.