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

Change-Id: I533f4ef42844be0d9a16f8d4feb5d93dc104fc3c