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

Change-Id: I9342714381a8a8f1a9917aff70bc021adf07ae5f