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

Change-Id: I56786fa936a90e1870aa8b49ccd3eb1e4e1c2de3