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

Change-Id: I581abc912bee99a4bbf9e93b5c024b1002205537