[automerger skipped] Import translations. DO NOT MERGE am: c731df816f  -s ours
am: 3bbd8bb851  -s ours

Change-Id: I6c226fefe3c9e73e4131ef1ff3e0cc23e99e1df5