Import translations. DO NOT MERGE
am: c1bca0543a  -s ours

Change-Id: I85acfd9049351e61ecf52c39bdd1b72aa9722e85