Import translations. DO NOT MERGE
am: 6f3ae7778c  -s ours

Change-Id: I10a744f60859902543922168db03a878614f641e