[automerger skipped] Import translations. DO NOT MERGE am: cf69168837  -s ours
am: b5bd00b809  -s ours

Change-Id: I5fef15381ce965557e449c9fc8bb586279d61b1f