am 452773fe: Merge "Address review comments."

* commit '452773fec59e033da4bb258a64bd65bd2ae658e8':
  Address review comments.