[automerger skipped] Import translations. DO NOT MERGE am: 69d02d1457 -s ours am: a26d9a8c7a -s ours

am skip reason: subject contains skip directive

Change-Id: I269b7c08f7b61621a47f58061d21b8d2bd2d2097