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

Change-Id: I792d62e6401a749b0f3c417352d919143b5461c3