Import translations. DO NOT MERGE
am: 4ced4787ce  -s ours

Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f