[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: bcd0808f27  -s ours
am: 539de9e991  -s ours

Change-Id: I4d16e9859726accf9baefebccdc1cb196c16698e