Merge "Address review comments."