[automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd

Change-Id: Iad2457215210dc2eb9dfbe4224fdf532da6595e2