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

Change-Id: I58ae274a134c457f7ed6cfb16bdd44c82e676584