[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 998221a361 -s ours
am: 7fb9123a74 -s ours
Change-Id: Ia18a28f533332b12ad01856a81041ff3071d53b6
This commit is contained in: