[automerger skipped] Import translations. DO NOT MERGE am: 333844ee5a  -s ours
am: d86e120326  -s ours

Change-Id: Idd3a0b7e9f19e0c6d0210faa58b7ca799d212fa7