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

Change-Id: Ie8d11fe4cd9276549e1cd3ab08483f94f9fbf17c