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

Change-Id: I275b63571980ac66a15af2bf2e5e8cf8e88eaaf1