[automerger skipped] Import translations. DO NOT MERGE am: 4eb61d73bc -s ours am: 3f08ffdb8a -s ours

am skip reason: subject contains skip directive

Change-Id: I4fbdf910d6f2c86fd5cded8f21e09c859655c134