Merge changes from topic "oth-master-art-varhandle-no-converions" am: a7d37cf735
am: 15e3847f92

Change-Id: I7ad0ef42fbc28f39106ed87006f8279996db680f