Import translations. DO NOT MERGE am: 9693f80eab  -s ours
am: 82af7a6bc5  -s ours

Change-Id: Ifa7f5adf81f95a5bde251b23440a92eabc1cd00d