Import translations. DO NOT MERGE am: 59d5ed7768  -s ours
am: 8eb2c31c42  -s ours

Change-Id: I8c0d4ba263db6a26c1b4d9e5cd6934c2411da918