Merge "Address comments from previous change (320592)"