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

Change-Id: I3c9b7b2c63ca33b8044893753e713eef55ad4fcc