[automerger skipped] Import translations. DO NOT MERGE am: 7435f64406  -s ours am: 878c6a9d75  -s ours
am: dbbc150b7e  -s ours

Change-Id: Ib3a09da2465607fe3215b1b0ad2c28ed06fc4546