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