6956202: Fix a few missed rebranding issues, please contact lines etc

Reviewed-by: jjg, darcy, weijun
141 files changed