Import translations. DO NOT MERGE am: 265cf73a43  -s ours
am: 003072d615  -s ours

Change-Id: Ia93dc2f69830a10f53970f69219d19b595c14167