[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 8ca170d09a -s ours am: 88199ac614 -s ours
am skip reason: subject contains skip directive

Change-Id: I3d31d9da88cde8df37eb0befe550c8b0c4b4935a