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

Change-Id: If3762d0880be154865b46654cde08275d3dd66fa