am 4f7adcf7: Merge "Update comments"

* commit '4f7adcf76a6f97076c05720d9c20a221a57692cb':
  Update comments