Merge "Address review comments on previous change." into main