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

Change-Id: I3bdcc99c089dbbcb17653f0a6aed788a762b59f2