[automerger skipped] Import translations. DO NOT MERGE
am: 8bf593bd5b  -s ours

Change-Id: I52af2879e439bd9f7a471f05e33d2a2406941ddd