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

Change-Id: I0581bd07b4f53824a0c9f2d573307b73e6f1ad02