[automerger skipped] Import translations. DO NOT MERGE am: a9aca04c64  -s ours
am: c95b0e746b  -s ours

Change-Id: I0d901681295dfa41a6b125ce74961580dd878845