[automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours am: 22f595b2c5 -s ours

am skip reason: subject contains skip directive

Change-Id: I05d2e42124ecd3d5d4bc7615028b9fbc0d869a65