[automerger skipped] Import translations. DO NOT MERGE
am: 2a39a042bc  -s ours

Change-Id: I267a49176e23e261220535e3584527b4769a6156