Import translations. DO NOT MERGE am: fcec32f1f7  -s ours
am: a56577ec6d  -s ours

Change-Id: I01c41e033761d4d32c791c08e5360f8406f2816c