Import translations. DO NOT MERGE am: 7e6e9220da  -s ours
am: d5bc80036b  -s ours

Change-Id: I147e0e6546f7d367ff81d45bc66e7829bcf45267