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

Change-Id: I2d7b2f167dfd7c486ee897f3bbacba720516d7ce