Move target platform to 2020-06 and update guava dependencies.
Trivial: NPE protection

Change-Id: I645f7a90e73d8cc204a6c6e5b03d9f089835b2f6
19 files changed