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

Change-Id: I18a9ed28b03fd051d0b8fc7ad1191c4e0a20c5a6