[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 58b8ca51d6  -s ours
am: 3eb7e1d045  -s ours

Change-Id: I532061ea8567d6cbfa107276d497c4bef5692f0c