Import translations. DO NOT MERGE am: a4295344f0  -s ours
am: 709975f97d  -s ours

Change-Id: Iac1c4cf41e1e03f539f3bf6d87aea436bde8f0d4