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

Change-Id: I9b2666af702ede461c2ee6cd7c7bd4182358c642