Merge "Ensure that OSR doesn't break local-variable get/set"
am: f94d960109

Change-Id: Ibcb2319391686a19e1f986e6ccf3e3521ec6d80a