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

Change-Id: I686d9a923e1d0b19e4bb74c3bebc8bdde7b21e1c