[automerger skipped] Import translations. DO NOT MERGE skipped: f4037fb69e skipped: 741c97faa9
am: 0c31d81cd1  -s ours

Change-Id: I404ba441a96f77be638d89c0c43f950200a94376