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

Change-Id: Id9b959f06aa3c037004196145e4fad6742681900