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

Change-Id: I456b9a57a96550ccc3496ec13147ef1650f72096