[automerger skipped] Import translations. DO NOT MERGE am: 57dfea5639 -s ours
am: 41b3386bcb -s ours
am skip reason: subject contains skip directive

Change-Id: If699d8c9576f05f9f5125e4f926ea3971cadfca0