[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 77e716e463
-s ours
am: 993bc3fcc6
-s ours
Change-Id: Ie3f3ccfe4883b4c03787305b49886babaad498b0
This commit is contained in: