Merge changes I44880f3d,I86c4200a

* changes:
  Inclusive Language Fixit: step #8
  Inclusive Language Fixit: step #7