Import translations. DO NOT MERGE am: 521b3d5259  -s ours am: db8719a721  -s ours
am: d19aba43cd  -s ours

Change-Id: I8a0451022b919ce20e19f1076e5759522c211596