[automerger skipped] Import translations. DO NOT MERGE am: ed032f3403 -s ours am: 9fc94ea66a -s ours
am: 24e84304ca -s ours
am skip reason: subject contains skip directive

Change-Id: I495a459c37d0d078bec591aa2d5192fb010895ca