Import translations. DO NOT MERGE am: 603821e  -s ours
am: 36f6be0  -s ours

* commit '36f6be07419850657dad649c80a3162da51b0e45':

Change-Id: I1d325a32982581f844482c00f8d9b6b44a41f490