Merge "Fix issue with obsolete methods and const-method-handle"