[automerger skipped] Import translations. DO NOT MERGE am: 7007fd05ec  -s ours
am: 4690364126  -s ours

Change-Id: Ifb408be3235956c5b782a276d8aad2020118d0ab