Merge "Rewrite mterp field access helpers"
am: 9999327c8f

Change-Id: I887d2ae33c89d983c06e716a6c4821815f1ffa09