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

Change-Id: I9cb42f21c58744655490cb81900a551fb4e20d77