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

Change-Id: I3e330ccdbb09073f305ff0d8ff3742793c59ad02