[automerger skipped] Import translations. DO NOT MERGE am: cf1f1d5dc1 -s ours am: 66967329bc -s ours
am: 51e28e4c98 -s ours
am skip reason: subject contains skip directive

Change-Id: I099c3553c5d512ca31bada8e1f9f0b03fa62ff9c