am f992a639: Merge "Add some missing comments"

* commit 'f992a6394b7a00b518971fa2390bc6532f0a5623':
  Add some missing comments