[automerger skipped] Import translations. DO NOT MERGE am: 8308e194af  -s ours
am: 212b7df86b  -s ours

Change-Id: If0118a5401b8243fa3fa6a71964d2817024dc17b