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

Change-Id: Ica53f59adc22c9442b6c823abc35a63c2e864d8e