[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793
am: c9590c8fc1  -s ours

Change-Id: I8c87d21d8f99ea3a8e9639a56e8acb10712e7366