Import translations. DO NOT MERGE am: 2e617bd51d  -s ours
am: 70afa060d3  -s ours

Change-Id: I7e71f8efa2530f545e4771cb61d710cd9594dc79