[automerger skipped] Import translations. DO NOT MERGE am: 990b77d2b8 -s ours am: 050b948ca8 -s ours
am: e66f9264cd -s ours
am skip reason: subject contains skip directive

Change-Id: Ie457c4eccdce08f8a0b32c4577b65f3a6c1aaf43