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

Change-Id: I97d5420a7815b8f2c143d738edebc75b750f977f