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

Change-Id: I65cf2e889dc920b38f0935bae22595956a153d04