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

Change-Id: Ib00f62572db4426c1031e8be0067a34f883f8ee5