Import translations. DO NOT MERGE
am: 3d67f24501  -s ours

Change-Id: I055d44dc36ff2b11a5d7a6e80195de157c819973