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

Change-Id: I94850d81da23fbd863b3ed2f7f5262402c6023a6