[automerger skipped] Import translations. DO NOT MERGE skipped: c9f5891a7f skipped: 0a1d5cc852
am: 4532cd3395  -s ours

Change-Id: Ia8e72bfd84aeb59e7138e04f943abd73fd1cceb9