[automerger skipped] Import translations. DO NOT MERGE
am: f1a410e6d5  -s ours

Change-Id: Id8e308c63fbb79385f0e4150b0243cc824462821