Import translations. DO NOT MERGE am: ed22521f97  -s ours
am: 3403a93d2c  -s ours

Change-Id: Ib6d48fbb4073e2e260dee108a9d7b83df9ebbb2d