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

Change-Id: If02ab0433db71a9419179767268417acb63dd579