Merge "Revert "Update language to comply with Android's inclusive language guidance""