[automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 am: 2053a11236  -s ours
am: ed50f647f7  -s ours

Change-Id: I10472e29a5d41543e9bf5ad1fe56e3facc79ad48