am 07b75192: am 9baa4df6: Merge "Address some code comments"

* commit '07b751921db10408931360af0b6e5c28c44a639e':
  Address some code comments