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

Change-Id: I20507d4398d330aeaa4b707dd61617635922bd27