Import translations. DO NOT MERGE am: 1377e2b985  -s ours am: df305805c6  -s ours
am: 51521f2e18  -s ours

Change-Id: I4e07de2591fe8fbc4c8512fb47807aa434ab9a5a