change some of the comments that contain prohibited words

Change-Id: Iaa8009e245edbcbc5adbe2348de4a014271c0ef9
CRs-Fixed: 2504418
2 files changed