Move dictionary facilitator handling.

Change-Id: Ibd42982996a36ac52b4c916035491b835f8d14f9
2 files changed