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

Change-Id: Ia139e21cd37de57998dc2e1a76cac8dd49822f76