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

Change-Id: Ic0a169bd1c11dec7e4bcc8d7a8a2a9ba30d72a6b