[automerger skipped] Import translations. DO NOT MERGE am: 0e06b18b30 -s ours am: 5600cc562c -s ours
am: ec3d63f28f -s ours
am skip reason: subject contains skip directive

Change-Id: If980a7d5412911582f3c58da7ee386e2b2f21a76