Import translations. DO NOT MERGE am: 31423f28b7  -s ours
am: e0d6074cc2  -s ours

Change-Id: I9325b08ccead00ef0cd6a534b539916b885b2bde