Import translations. DO NOT MERGE am: 05a48e2a3d  -s ours am: edbd698183  -s ours
am: 23c37cddac  -s ours

Change-Id: Ib2fd440354937f5a16f82a78c4100be2d6603738