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

Change-Id: If860200f7e59fc1c29d45f5bb0c2848cff3fe4fd