Merge "Fix problem with message indent. b/25054130" into nyc-dev