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

Change-Id: I6c9235549213d93ed0a86b85fe9833216a459e6f