(bug 40759) Add namespaces for fi

Change-Id: I332b0a60cab5f392e04f9d37b670bb5803050832