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

Change-Id: I3d094941ffb77ee5880cde1755f9f00cd9f2fcb6