Import translations. DO NOT MERGE
am: 65cdfbaad6  -s ours

Change-Id: Ife5284b2e8bb1b0a92db05e6d698ad8d3522c60e