This reverts commit f39655c0c8. Reason for revert: patch does not fix all stream hangs. So another patch was merged which fixes all issues. Change-Id: I332d1ea29c23747b46b7667fe3e34e0ceefd2b23
f39655c0c8