Merge "Address review comments for change 25352fc06c84cdab8a2ab."