Merge "add statsd to namespace mapping list" into main