Import translations. DO NOT MERGE am: ee1ab312ec  -s ours
am: ed3ba01c62  -s ours

Change-Id: I72790292dfe53727342dd81a3bb867bfb484f0cf