Merge "Update logging to help debug b/200572078" into sc-v2-dev