[automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7 am: 387047a201  -s ours
am: f12ba9fee4  -s ours

Change-Id: I5356cae2b66a847ac9622d4c866c592f8f663ba0