Import translations. DO NOT MERGE am: bcf877887b  -s ours
am: d3156f049f  -s ours

Change-Id: I802da8ca6ea2fed9eef3c7d113c34961503a90d0