am d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]

* commit 'd4f0073f4805cd1036218f243d9b7c7c5bb90e41':
  Remove references to java package class Objects. [DO NOT MERGE]