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

Change-Id: I572c1a3b0af35ba508045d003114a7b55501537d