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

Change-Id: Ica98dad1198d21d4205e0c928c0e077d5969c67f