Merge "Address comments from a previous change."