Merge "Addressing comments in 1130236."