Merge "Attempt to reduce flakiness of some SimPhonebook tests"