am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE

* commit 'f351b6c0095a449f72342e88ecd88c18abb414c5':