bring back dictionaries to 4-3 branch

Change-Id: Ie1bfde604aa336ff38701fbc80d7f366e8e12410