Import translations. DO NOT MERGE
am: d1d8799384  -s ours

Change-Id: Icda326e12c060b1998a561fb85474063f0000c87