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

Change-Id: I9051cf41c82326a1d6aec0fbb4a9f5f5bc1acf72