[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 4a068991e7  -s ours
am: aa1ca445fd  -s ours

Change-Id: I9619a1fe1d458e15ae0cba17e148e2288027691d