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

Change-Id: I6951039ef2fc1a8770698c6da24944b3cb81ff2a