Import translations. DO NOT MERGE am: fbdea47c44  -s ours am: 8b334cb99a  -s ours
am: ecb8315ba4  -s ours

Change-Id: Id12b28467cacd51ac8c899a32971881ca7c4e007