[automerger skipped] Import translations. DO NOT MERGE am: 73a1e3f1f3  -s ours am: ec91155bea  -s ours
am: b49e80a62e  -s ours

Change-Id: I7f25e54cf4cc46b536314436c0a79d00edbc1fb6