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