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

Change-Id: I296d8dbce7d725f5601a740bdc7f47b1e8a21fdf