Merge "Fix expectations of 988."