[automerger skipped] Import translations. DO NOT MERGE am: 4712246f85 -s ours am: 8c0e0d3209 -s ours
am: 9b6627b9ee -s ours
am skip reason: subject contains skip directive

Change-Id: I74b3c42861ff95b6ff2e4ff38d33323c90da2fcf