[automerger skipped] Import translations. DO NOT MERGE
am: b2248ad38e  -s ours

Change-Id: Ia83113a81b6f35e385701ee6a81943c1cc08b515