am e14a5ef6: Merge "Use java.util.Objects instead of internal API"

* commit 'e14a5ef660ebc65cad53c1e108c99d9fd98a4696':
  Use java.util.Objects instead of internal API