[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: c60c2527ae  -s ours

Change-Id: I6761f6c7cf767364e99ae8f4ceb0782eec51aa52