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

Change-Id: If916860bdd4a23da1ab51058b8050790acae1630