[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: fccf9d031f -s ours
am: bd1f8940d6 -s ours
am skip reason: subject contains skip directive

Change-Id: I4e48864087c874114e582b7a15828a950498d1d6