[automerger skipped] Import translations. DO NOT MERGE am: 86dfbd6254 -s ours am: edbddf7f42 -s ours
am: 3590e5d52c -s ours
am skip reason: subject contains skip directive

Change-Id: Id179916589bdb32c328b42136a4a9004a8da46ca