Import translations. DO NOT MERGE am: bfb4048082  -s ours am: fa1cfd3258  -s ours am: 47809c3c1d  -s ours
am: d7e876f29a  -s ours

Change-Id: I8bbd5170b5a75e4d8c2bddfd102e587e7102f9ce