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

am skip reason: subject contains skip directive

Change-Id: I7b6a5ac7f93fd7acf618de1058535d6706741dfa