Merge "Fix issue with obsolete methods and const-method-handle"
am: 0bdc1fc702

Change-Id: I6f848351d5689aea2eef02a775a0f4dc332ee79a