[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: cba5f92768  -s ours
am: 0502df2539  -s ours

Change-Id: I2411bdb3ecedea24d8bcc30e5cb0d151b60ec8ea