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

Change-Id: I239f76d37d8fc9c9175297f110fc78eeeae83e84