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

Change-Id: I28d4997cde7ae4552ff935ff6c02b408c45b87b9