[automerger skipped] Import translations. DO NOT MERGE am: f52e3c294b  -s ours
am: 254e91b4b0  -s ours

Change-Id: Iaba4258338257b00d2b5893a92ecaadbf71fda31