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

Change-Id: I17ca6a25ca066bea459fe430fb8870aa60d8bb96