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

Change-Id: Ic3be6b7e7f1230660aa9c2ac9902d0463cb01da0