Import translations. DO NOT MERGE am: bfb4048082  -s ours
am: fa1cfd3258  -s ours

Change-Id: Idcf1d386c6c575279a81ec95c20e8cc0056574eb