Import translations. DO NOT MERGE
am: 584cf8e7e7  -s ours

Change-Id: Ia35e794e1dc7f35a36e930f06193fbd430a70e32