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

Change-Id: I8b73a2e7d8b158b87210d69f7752b3525ad9c9c4