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

Change-Id: I2fc66cb98839e805d8fa8e3daf1de6f570355ef6