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

Change-Id: I192b22e7aaa4382365e22ff2d2b85b16aea21433