Import translations. DO NOT MERGE am: f2e311f117  -s ours am: 581dd8cfdd  -s ours
am: 2b6d537648  -s ours

Change-Id: I84ba3077694a0f179941652e85520e0a19681bf9