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

Change-Id: Iee877848eaa4667a66451144e78d31958cdac590