[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7b6247f7a3  -s ours
am: 6f61332df5  -s ours

Change-Id: I46f9a2f50fefa9c039fa2f6db95046b1070bddbf