[automerger skipped] Import translations. DO NOT MERGE am: ae6d9a83b2 -s ours

am skip reason: subject contains skip directive

Change-Id: I649d1ccfedf3698e590fe9edd3b012ec7bfac12f