[automerger skipped] Import translations. DO NOT MERGE am: f4c4b9a3a4 -s ours am: 87d3f97ab4 -s ours

am skip reason: subject contains skip directive

Change-Id: I350e4326733284da793372d326c131a3f6fa7dcb