[automerger skipped] Import translations. DO NOT MERGE skipped: a4513689c8 skipped: baff683653
am: 42e8a0c2de  -s ours

Change-Id: I21df47ac8511c2003fa9dd0c07065cb8f7cb8b28