Merge "wfBCP47Test: Remove commented-out testcases"