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

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