[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295

Change-Id: Idb34650f4e4ffa9086addb3fc25cf528c9b60aa8