Merge "Fix stack use-after-scope in InputReader" into oc-mr1-dev