Import translations. DO NOT MERGE am: b60dfc2ac1  -s ours
am: 9b50e71b86  -s ours

Change-Id: I08edf402c05e545a9ac61f159bcb7e9d24c713be