Merge "Fix E_STRICT in ForeignAPIRepo"