Log less
Cherrypick 52ded8ae3dcbbec5d6f00a0717fbfa7d1408b34c