Import translations. DO NOT MERGE am: facc57619c  -s ours
am: d045d85bdd  -s ours

Change-Id: Ica39978105e5df159f842cb5d53c3baa7a593a72