Import translations. DO NOT MERGE am: 65cdfbaad6  -s ours am: 17dbc1ab21  -s ours
am: f9fbbbc49c  -s ours

Change-Id: I65a3c853d49ba5941dd60bd8b20e487054cfac50