[automerger skipped] Import translations. DO NOT MERGE am: 000f97dcf9  -s ours
am: 16191b3408  -s ours

Change-Id: I25c2d0e11f48a0cfa54bd1790ab858bbec109bc3