am a9b296a5: (-s ours) am edd048fb: am d4f0073f: Remove references to java package class Objects. [DO NOT MERGE]

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