Import translations. DO NOT MERGE am: 33c96f4d21  -s ours
am: 0a93b23104  -s ours

Change-Id: Ie5a386a2dc9ba1a3caf1f5e65aa79415b895c633