[automerger skipped] Import translations. DO NOT MERGE am: 1c42694010 -s ours am: b3ad003bd5 -s ours
am: 66775a25b4 -s ours
am skip reason: subject contains skip directive

Change-Id: I87e7c89eccea4098d80fa9dbb834abfcff96cca6