Merge "Temporary fix for SimPhonebook continuous test failures"