Merge "Turn off duplicate log" into nyc-dev