Merge changes I0f3f0333,If447b2cf

* changes:
  Update language to comply with Android’s inclusive language guidance
  Fix some wording to comply with respectful-code