[automerger skipped] Import translations. DO NOT MERGE am: 09da14be40 -s ours am: 27c67b2bf1 -s ours
am: 50daa9a78f -s ours
am skip reason: subject contains skip directive

Change-Id: I6badf436712935b88487afb2b881b54203a214bc