[automerger skipped] Import translations. DO NOT MERGE am: 7de400c905 -s ours
am: 996f96060e -s ours
am skip reason: subject contains skip directive

Change-Id: Id1d79fde2e4e9af339e5a9750b8368c66f534c9a