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

Change-Id: I169086c4315288218411eb0a68fcc0e602fbf58b