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

am skip reason: subject contains skip directive

Change-Id: Ibec7073084825c7586f5dd7b76d87f64b84ed7d8