Merge changes from topic 'USAGE_IO_INPUT' am: 70fac233fa am: db889edb1d
am: dbe0a73edb

Change-Id: Ib4fd8b57711735ad9dc59142ade2757839918185