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

Change-Id: I0beb488163bd8b63a4770939887a0e7df739f583