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

Change-Id: I7918c0c6bdb7f25f8ac737c699b1bae0c54e2f84