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

Change-Id: I4d93781a7e2f2d20b1d0e25338af6e24f1b5a448