[automerger skipped] Import translations. DO NOT MERGE skipped: 39a33e2ffb skipped: 2e4c69a707
am: d7b199be9a  -s ours

Change-Id: I7aa21a0d4310323f666a5326a019555d15e006ff