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

Change-Id: I73dee13d57d8b11be04a0ed72d8929a2db6f2983