[automerger skipped] Import translations. DO NOT MERGE am: 822856aea5 -s ours
am: 4885137179 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia5f1520a6554a6008bb959bc3df87bb70f74d043