[automerger skipped] Import translations. DO NOT MERGE am: 05e785f390 -s ours am: e37b2d19e0 -s ours am: 884db097ae -s ours
am skip reason: subject contains skip directive

Change-Id: I64a00c47ff22deb0097b932531e5206606e44106