Merge "Update HCE foreground test strings." into nyc-dev