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

Change-Id: Iba137ca6d698fb14d63f37517468be0ebd84b519