am 68ffda88: Merge "Address some leftover comments"

* commit '68ffda887e35f35e978f2f607b7a91e44a5e1969':
  Address some leftover comments