[automerger skipped] Import translations. DO NOT MERGE am: 7cf55f2a69 -s ours
am: 8a8ead03b9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie9210be78fd031949eaede852d451ae9089a6cae