[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475  -s ours am: eef34578b3  -s ours
am: ede8c555e0  -s ours

Change-Id: I0e5265b0cbc53856af61f0f7540ec9c265d28438