Import translations. DO NOT MERGE am: d3e147527d  -s ours
am: 36c513d8d5  -s ours

Change-Id: I6bc5b185b3a8fb91526d15cdadac76a5f56eadba