[automerger skipped] Import translations. DO NOT MERGE
am: bff0925872 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c40881901156ed76a6e2a95240f43f0ad1b1741