Import translations. DO NOT MERGE
am: 64d3e22e11  -s ours

Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948