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

Change-Id: Id1b06b0bea90993f8f91192f432d172d5d123f5a