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

Change-Id: Ice132c8e0fa7acc12633984c87ac258ef56e7323