am 0a21435a: am 4500fcbe: Merge "Address some comments"

* commit '0a21435a7bc26267424c244e274080e500255ab9':
  Address some comments