Import translations. DO NOT MERGE
am: 7fff7b1de1  -s ours

Change-Id: I0e23400c42721c694577478f3bea2a65ba22b060