Merge changes from topic 'USAGE_IO_INPUT'
am: 70fac233fa

Change-Id: I3f8db9b25a8ccee8ddb596baf5e54a268747de9f