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

Change-Id: I8540ec656b922d2a56b8ddcb58c719e52a1bb5c6