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

Change-Id: I13bb676b52e10295a805a8a2f381f5493fdb80be