[automerger skipped] Import translations. DO NOT MERGE
am: 76169b7440 -s ours
am skip reason: subject contains skip directive

Change-Id: I42e94991656c26a4d8b43e88b5cf7ce8af8164be