Import translations. DO NOT MERGE am: cf9a807e7e  -s ours
am: d943567007  -s ours

Change-Id: I123efbf60e6b08e6eab6234ab5eeb8a5fc49e593