Import translations. DO NOT MERGE am: 6da15efecc  -s ours am: bed39c40ee  -s ours
am: 14bd1b3c7c  -s ours

Change-Id: Ic26ac8864fc45bad9d27e4d5d5c7c9efe96fbf87