am fd0147d8: am d920c917: am 6ec3f63d: Merge "Make dictionary structure policy have updating methods."

* commit 'fd0147d8dd6c95dd2e82e583e059fc926be44d71':