[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: ae571ef6e3  -s ours

Change-Id: I6381866dfd5c67d0d94954474dd15b23f1d6aa7e