Import translations. DO NOT MERGE
am: 8bea919d37  -s ours

Change-Id: I67c3a96bfa8497980eb80b993a8861d6b13de029