Patch Set 1: Looks good to me, approved; IP review completed

Although it is not clear to me how we can hit this problem this bugfix is definitly good. But we need a good build before we can submit this.