[automerger skipped] Import translations. DO NOT MERGE am: 8a83fcf4f7 -s ours am: 1ba41d446d -s ours
am: 40808baef8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc7d09b547fcd6527a15c5515516842c38d743d6