Import translations. DO NOT MERGE
am: 02b20df895  -s ours

Change-Id: Ic95dbb727bcb714d7678b33cfe9d953769be3932