am d0d728eb: am 71895285: am e9631bcd: am 0152ff53: Merge "Update dictionaries"

* commit 'd0d728ebdaabe5f66ef0601cfeb44e72022533c6':