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

Change-Id: Id429fbffbcd0a24fe7d6e7b40a7921b17c5d814d