[automerger skipped] Import translations. DO NOT MERGE am: 7b913f2f73  -s ours
am: 998fc06d46  -s ours

Change-Id: Ica0ec9d6cca8ce0de5b325c6a18f9f70e2ae4475