Simplify InternalStreamLock instance handling

Change-Id: Id5bd445ad4f2397cbff01099ba3779736bb47e61