Import translations. DO NOT MERGE am: 6f47139958  -s ours am: 9f30b74dc7  -s ours
am: cbd40680cd  -s ours

Change-Id: Id61e784958499f815e87c3caeddd2db94daa89e0