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

Change-Id: I77c011f315d04b2929b815412c39be75b406d0e8