tree 1723c2ed1534c4165d473dbb63dc0457dcd4c4e6
parent 3b63eea65cbd4b603e315109f94d017ec48db77c
author copybara-service[bot] <copybara-servicebot@google.com> 1594968764 +0000
committer Kevin Moore <kevmoo@google.com> 1611173918 +0000

Minor simplifications to help with Null Safety

This simplifies the code a bit and helps the migration tool
to figure out the nullability correctly.

PiperOrigin-RevId: 321723762