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

Change-Id: I9b0796e1c8f4327c241f78230f02d502ad016cb1