Import translations. DO NOT MERGE am: 45779af080  -s ours
am: 49af78ff0b  -s ours

Change-Id: Ie2fb4df6f41253aff291cefd284604c20170d0c6