am 4500fcbe: Merge "Address some comments"

* commit '4500fcbe682d666a24c2e8f6e0cb90cfb35d3fa3':
  Address some comments