[automerger skipped] Import translations. DO NOT MERGE am: 5e2cd1e3d1  -s ours am: e1cb10d1db  -s ours
am: 17afa1d724  -s ours

Change-Id: Ic70a530ffc46492ff9990d65f2a1be82ce11e8ad