Merge "Fix nits and log from I996d257e089f0676e316f2b14207c343063ccf8e"