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

Change-Id: I3d8655c2b647674d28d223f5deb9b6d21b42d106