Import translations. DO NOT MERGE am: 7100f8157d  -s ours am: ae57e2f654  -s ours
am: 79ce020c67  -s ours

Change-Id: I4eca4ec8eb030ee9f709ebebe151908a1529b515