[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: ae54c9cfdd  -s ours
am: 3bb170dd33  -s ours

Change-Id: I954af613421ce26950e1f60f52145204ca784cd0