[automerger skipped] Import translations. DO NOT MERGE am: 8dda6713c0 -s ours am: 5f83b0c3ad -s ours
am: 0f35b4de14 -s ours
am skip reason: subject contains skip directive

Change-Id: I1b0e0452d8079ca8189e58fa59f7da9b6fabd4d3