[automerger skipped] Import translations. DO NOT MERGE am: a109f5245e  -s ours
am: 5e9db4a568  -s ours

Change-Id: I23ef189cdd224fc19c694e675b2ff390f75d5b03