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

Change-Id: I9949a881f6494021964a608b83c7824a32f6f716