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

Change-Id: Ifbcadd119999d27a9acb66a2a12976b1aad44533