[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ee61bde16 -s ours am: 9b748c30f5 -s ours am: 19caba09e2 -s ours am: b17b5e1a96 -s ours

Change-Id: I6662401af2128e7b2f9f913843e3efbd3a99ecf8