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

Change-Id: Ic0745d597dc2566e7435d2c1e997b608dc0d7d46