Merge commit '515c82cdde6334778d8a75a7ad0bbb97271bed88' * commit '515c82cdde6334778d8a75a7ad0bbb97271bed88': Add some logging to help diagnose b/2164183