Merge "Address comments on previous CL"