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

Change-Id: Ie325587662f1430aad3e3ad87937686ed3f25045