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

Change-Id: I1c575f6ecf663f1b356c52cd4ec44bacc518d309