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

Change-Id: Iae819f8062ce6ff9187cc4afd13503637067d912