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

Change-Id: Ibc685aa6c906047ba014220014b0a60e96fa1d55