Import translations. DO NOT MERGE am: 5d0af58793  -s ours
am: edf73ab967  -s ours

Change-Id: I856c9036dad1726eb70b0569fc49352a66b02864