Import translations. DO NOT MERGE
am: 7a5eadc001  -s ours

Change-Id: I399e5afcc6a7f9bd6d1e0b23592d5ceefa9a27f1