Merge "Fix stack use-after-scope in InputReader" into oc-mr1-dev
am: 9e6c95deda

Change-Id: Ia51f56bca86f5e04cef4151ca2692bcf49e25aeb