Import translations. DO NOT MERGE
am: 3beb113d7c  -s ours

Change-Id: Ic4d3046ab27b074be059cc23d372dfd875974533