Merge changes If362e2ad,I1246175c,Ie4aa961e,I6e69dfcd

* changes:
  Updated comments using https://source.android.com/setup/contribute/respectful-code
  Updated comments using https://source.android.com/setup/contribute/respectful-code
  Updated comments using https://source.android.com/setup/contribute/respectful-code
  Updated comments using https://source.android.com/setup/contribute/respectful-code