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

Change-Id: I5c22b5dff3a95cfcc1c3f7a02f8bfb4a036a3c52