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

Change-Id: Ia53b6b5e75e0633637f743b5170a6d5dc40b250b