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

Change-Id: I39b244584aee86720616cd8782a8bfdcbdbab732