[automerger skipped] Import translations. DO NOT MERGE am: 6b13e7ddc1 -s ours am: ddae083d38 -s ours
am: 09d2d3950e -s ours
am skip reason: subject contains skip directive

Change-Id: I768cb335cae8c204b0f41be1e7acbd5583b17dad