[automerger skipped] Import translations. DO NOT MERGE am: 1f6344b270  -s ours am: d4ad16c3fb  -s ours
am: 1087bd5a94  -s ours

Change-Id: I38975fe9271d3508093547b2c4f5315465cc5c27