[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 97a1f85291
-s ours
am: 70d8e8dea2
-s ours
Change-Id: I7d72846456183dedbd9a7b8fa2953c9c6b9ed31f
This commit is contained in: