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

Change-Id: I42c834f14078701ac1a8908319cf3bee3715bd1a