[automerger skipped] Import translations. DO NOT MERGE am: 0e894a09a2  -s ours
am: 0437cbaee9  -s ours

Change-Id: I0191121c0a6bdca2ee7e174e389e2dbba6f94e32