Merge "Ensure that OSR doesn't break local-variable get/set" am: f94d9601 am: 8d6c4408 am: 0f2ddb0c am: 2946d5f9 Change-Id: I83e162789a444470e8f89e45d091317fc1e52884