[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce am: 71f5cfa650  -s ours
am: f2ce740a1e  -s ours

Change-Id: Ibcaa1f68b57714de2a7295d93d1875274b750071