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

Change-Id: I947826e9c2224d223d526c96c64dc4f5ca2c3251