[automerger skipped] Import translations. DO NOT MERGE am: 0fd6188501 -s ours am: e980dd18ab -s ours

am skip reason: subject contains skip directive

Change-Id: Iebe5d5c38034b8dabc48366c0fd618ec3a6f7bad