am 9baa4df6: Merge "Address some code comments"

* commit '9baa4df684bdf0150bd8632f991708627772ea85':
  Address some code comments