(bug 44101) fixed assertion violation caused by inconsistent state of Claims object

Change-Id: Ia693fbde8d6b85875ceaf4fbad186da12ba7f900
Merge "(bug 44101) fixed assertion violation caused by inconsistent state of Claims object"