[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 20add0a4c6  -s ours am: ebccff42db  -s ours
am: 7845c968ce  -s ours

Change-Id: I50119db0237f47fb359e1963c712098c8ca8325b