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

Change-Id: I6193ff11287705f8ba889592530f660ec6046ca1