Merge "Follow up comments to 0cdc103e8287d3bd01944cdd2afb5c11897998fe."