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

Change-Id: I84207ea9ed424d36dc3a0d36a9582a8ef82854c2