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

Change-Id: I040121c18d1cc3d6915068e885a62b65d997a530