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

Change-Id: Id0fb5a6778c102d0d4c84b723593929cf5306526