Merge "Fixes for constant method handles"
am: 4dd8880401

Change-Id: I694cf094e91726b574f0bece0eb8f0305e690349