[automerger skipped] Import translations. DO NOT MERGE am: eacad231f4 -s ours
am: 08431769ad -s ours
am skip reason: subject contains skip directive

Change-Id: I0ab79bc7733bcb8e18c78ca33687160e16aa041b