[automerger skipped] Import translations. DO NOT MERGE am: 693df84856  -s ours
am: 738d76456d  -s ours

Change-Id: I15da7e22587de4eca1398a3600f1e38857758da8