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

Change-Id: If63e80c1cbdfa7b56d8c6f5d902b990686daf2be