[automerger skipped] Import translations. DO NOT MERGE am: c5e00d42c1 -s ours
am: 757cd8a36c -s ours
am skip reason: subject contains skip directive

Change-Id: I7caec1f6195c4198e3736b07246589a2991b287f