Import translations. DO NOT MERGE am: 8b6ea60fac  -s ours
am: aee10c80ab  -s ours

Change-Id: I282b55adf291ceea96cb988c1d6df80fcc8b08e3