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

Change-Id: Iecb564e17879772caf075ca8b0ea604da029f173