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

Change-Id: I725532127edb1f51097512043f28c9bb152b129e