REVIEW Remove wrappedinputstream

Feature Build: http://bamboo.s/browse/NX-OSSF28-2