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

Change-Id: I9e63c25c69820ba993fae2ba2a57fb40894f6720