Import translations. DO NOT MERGE
am: 2bc3a6d386  -s ours

Change-Id: Ifb3c1593586f24e93440d3257ebf0358eb8ef961