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

Change-Id: Ie712bf9eb3e740abb0435833349a272d4817f153