Merge "Fix expectations of 988." into pi-dev