Import translations. DO NOT MERGE am: 83b18efa96  -s ours am: c2860718a4  -s ours
am: d621f3a251  -s ours

Change-Id: Ia2dd649edc2882932f3aa39b2607631fb886dede