Merge "Fix method handles using wrong section"
am: 44720c6fb8

Change-Id: I5c25de68baf864dcffc956650d94260a3e8ed990