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

Change-Id: Id8279f685c9c7b01c79c0131ca724498775b9263