Import translations. DO NOT MERGE
am: 5ad7d6e328  -s ours

Change-Id: I6b1a80f5cbc2282afe50101e2a6fdc3b7c17db52