Import translations. DO NOT MERGE
am: 251cbcbcc5  -s ours

Change-Id: Iac1be0f9462447d5935664f5f111a2d721237436