Avoid a couple of potential bugs.

Change-Id: I287e14dd365f8d70b0d83359abd26ce3e9929a49
Reviewed-on: https://code-review.googlesource.com/5251
Reviewed-by: Paul Wankadia <junyer@google.com>
1 file changed