Import translations. DO NOT MERGE am: b5841fc465  -s ours am: 60215494f9  -s ours am: efae963416  -s ours
am: 39010b12e8  -s ours

Change-Id: I712a637cc9231deefa89496e3883b1b9a72fe25a