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

Change-Id: Iafe649d261b8c51456a47a65da28c54b26862b20