[automerger skipped] Import translations. DO NOT MERGE am: f35f84a28f  -s ours
am: 09939cf0b0  -s ours

Change-Id: Ic347300a80e8b1aac0aa3fa5341f9c26e64446ea