[automerger skipped] Import translations. DO NOT MERGE am: 20ac5ce5cb  -s ours
am: c7e65586f7  -s ours

Change-Id: I64719c37d0d191018296d8ed73f64a531f9eb1b6