[automerger skipped] Import translations. DO NOT MERGE am: 8d0074b5e5  -s ours
am: 787c1f2797  -s ours

Change-Id: I93dae3aa4d55bb45d2d591d4b117624fd3428f1e