[automerger skipped] Import translations. DO NOT MERGE
am: 1de3144e84  -s ours

Change-Id: I187cd9b66c78db194329cc547504f82ba2d69d65