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

Change-Id: I20cd58083962fb72348d3d89ecb309b503173804