[automerger skipped] Import translations. DO NOT MERGE am: 994ae82c34  -s ours
am: 016843fa80  -s ours

Change-Id: I6532b8b1a57aa016227468720258c5ddec03850c